Change in openvpn[master]: Fix missing spaces in various messages
A message that is not in the archive (sent off-list or not yet received): gerrit.1721648146000.Ic27d84c74c1dd6ff7973ca6966d186f475c67e21@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/679?usp=email
to review the following change.
Change subject: Fix missing spaces in various messages
......................................................................
Fix missing spaces in various messages
These result from broken up literals where it
is easy to miss the missing space.
---
M src/openvpn/dco.c
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/ssl_verify.c
4 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/679/1
src/openvpn/dco.c +1 -1
@@ -185,7 +185,7 @@ }else { -msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to" +msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to " "primary-id=%d secondary-id=(to be deleted)" , primary->key_id); }
src/openvpn/multi.c +6 -6
@@ -1804,7 +1804,7 @@ }else if (dco_enabled (o)) { -msg (M_INFO ,"Client does not support DATA_V2. Data channel offloaing " +msg (M_INFO ,"Client does not support DATA_V2. Data channel offloading " "requires DATA_V2. Dropping client." );auth_set_client_reason (tls_multi,"Data channel negotiation " "failed (missing DATA_V2)" );
@@ -1815,7 +1815,7 @@* not accept our pushed ciphers */ if (proto &IV_PROTO_NCP_P2P ) { -msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client" +msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail." ); }
@@ -2027,7 +2027,7 @@/* Not EOF but other error -> fall through to error state */ default :/* We received an unknown/unexpected value. Assume failure. */ -msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred" +msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred " "client-connect resultfile" ); ret =CC_RET_FAILED ; }
@@ -2427,7 +2427,7 @@*/ if (!mi->context.c2.push_ifconfig_defined) { -msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote" +msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote " "--ifconfig address is available for %s" ,multi_instance_string (mi, false, &gc)); }
@@ -2443,7 +2443,7 @@print_in_addr_t (mi->context.options.push_ifconfig_constraint_netmask,0 , &gc);/* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@@ -2492,7 +2492,7 @@ }else if (mi->context.options.iroutes) { -msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute" +msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute " "only works with tun-style tunnels" ,multi_instance_string (mi, false, &gc)); }
src/openvpn/options.c +2 -2
@@ -7033,7 +7033,7 @@ }else if (streq (p[0 ],"max-routes" ) && !p[2 ]) { -msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored." +msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration." );
@@ -9328,7 +9328,7 @@ s++; }msg (M_WARN ,"DEPRECATED FEATURE: automatically upcased the " -"--x509-username-field parameter to '%s'; please update your" +"--x509-username-field parameter to '%s'; please update your " "configuration" , p[j]); } }
src/openvpn/ssl_verify.c +1 -1
@@ -717,7 +717,7 @@ {const char *hex_fp =format_hex_ex (BPTR (&cert_fp),BLEN (&cert_fp),0 ,1 ,":" , &gc); -msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint" +msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)" , hex_fp); goto cleanup;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/679?usp=email )
Change subject: Fix missing spaces in various messages
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
LGTM. Good that someone finally "just fixed these" ;-)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 22 Jul 2024 12:05:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 Fix missing spaces in various messages
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
These result from broken up literals where it
is easy to miss the missing space.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/679
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/dco.c +1 -1
@@ -185,7 +185,7 @@ }else { -msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to" +msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to " "primary-id=%d secondary-id=(to be deleted)" , primary->key_id); }
src/openvpn/multi.c +6 -6
@@ -1804,7 +1804,7 @@ }else if (dco_enabled (o)) { -msg (M_INFO ,"Client does not support DATA_V2. Data channel offloaing " +msg (M_INFO ,"Client does not support DATA_V2. Data channel offloading " "requires DATA_V2. Dropping client." );auth_set_client_reason (tls_multi,"Data channel negotiation " "failed (missing DATA_V2)" );
@@ -1815,7 +1815,7 @@* not accept our pushed ciphers */ if (proto &IV_PROTO_NCP_P2P ) { -msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client" +msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail." ); }
@@ -2027,7 +2027,7 @@/* Not EOF but other error -> fall through to error state */ default :/* We received an unknown/unexpected value. Assume failure. */ -msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred" +msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred " "client-connect resultfile" ); ret =CC_RET_FAILED ; }
@@ -2427,7 +2427,7 @@*/ if (!mi->context.c2.push_ifconfig_defined) { -msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote" +msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote " "--ifconfig address is available for %s" ,multi_instance_string (mi, false, &gc)); }
@@ -2443,7 +2443,7 @@print_in_addr_t (mi->context.options.push_ifconfig_constraint_netmask,0 , &gc);/* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@@ -2492,7 +2492,7 @@ }else if (mi->context.options.iroutes) { -msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute" +msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute " "only works with tun-style tunnels" ,multi_instance_string (mi, false, &gc)); }
src/openvpn/options.c +2 -2
@@ -7033,7 +7033,7 @@ }else if (streq (p[0 ],"max-routes" ) && !p[2 ]) { -msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored." +msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration." );
@@ -9328,7 +9328,7 @@ s++; }msg (M_WARN ,"DEPRECATED FEATURE: automatically upcased the " -"--x509-username-field parameter to '%s'; please update your" +"--x509-username-field parameter to '%s'; please update your " "configuration" , p[j]); } }
src/openvpn/ssl_verify.c +1 -1
@@ -717,7 +717,7 @@ {const char *hex_fp =format_hex_ex (BPTR (&cert_fp),BLEN (&cert_fp),0 ,1 ,":" , &gc); -msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint" +msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)" , hex_fp); goto cleanup;
[Openvpn-devel] [PATCH applied] Re: Fix missing spaces in various messages
Went through the individual messages, all very welcome fixes.
Test compiled, just to be sure no quote or anything escaped.
Your patch has been applied to the master and release/2.6 branch (bugfix).
commit 824fe9ce497bd26a9609abb7324427e906ead6a4 (master) commit 02346806adafd3c656f018a7a1b3fb2c585a1cea (release/2.6)
Author: Frank Lichtenheld Date: Mon Jul 22 14:10:34 2024 +0200
Fix missing spaces in various messages
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28950.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/679?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: Fix missing spaces in various messages
......................................................................
Fix missing spaces in various messages
These result from broken up literals where it
is easy to miss the missing space.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28950.html
---
M src/openvpn/dco.c
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/ssl_verify.c
4 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/679/2
src/openvpn/dco.c +1 -1
@@ -185,7 +185,7 @@ }else { -msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to" +msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to " "primary-id=%d secondary-id=(to be deleted)" , primary->key_id); }
src/openvpn/multi.c +6 -6
@@ -1804,7 +1804,7 @@ }else if (dco_enabled (o)) { -msg (M_INFO ,"Client does not support DATA_V2. Data channel offloaing " +msg (M_INFO ,"Client does not support DATA_V2. Data channel offloading " "requires DATA_V2. Dropping client." );auth_set_client_reason (tls_multi,"Data channel negotiation " "failed (missing DATA_V2)" );
@@ -1815,7 +1815,7 @@* not accept our pushed ciphers */ if (proto &IV_PROTO_NCP_P2P ) { -msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client" +msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail." ); }
@@ -2027,7 +2027,7 @@/* Not EOF but other error -> fall through to error state */ default :/* We received an unknown/unexpected value. Assume failure. */ -msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred" +msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred " "client-connect resultfile" ); ret =CC_RET_FAILED ; }
@@ -2427,7 +2427,7 @@*/ if (!mi->context.c2.push_ifconfig_defined) { -msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote" +msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote " "--ifconfig address is available for %s" ,multi_instance_string (mi, false, &gc)); }
@@ -2443,7 +2443,7 @@print_in_addr_t (mi->context.options.push_ifconfig_constraint_netmask,0 , &gc);/* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@@ -2492,7 +2492,7 @@ }else if (mi->context.options.iroutes) { -msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute" +msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute " "only works with tun-style tunnels" ,multi_instance_string (mi, false, &gc)); }
src/openvpn/options.c +2 -2
@@ -7033,7 +7033,7 @@ }else if (streq (p[0 ],"max-routes" ) && !p[2 ]) { -msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored." +msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration." );
@@ -9328,7 +9328,7 @@ s++; }msg (M_WARN ,"DEPRECATED FEATURE: automatically upcased the " -"--x509-username-field parameter to '%s'; please update your" +"--x509-username-field parameter to '%s'; please update your " "configuration" , p[j]); } }
src/openvpn/ssl_verify.c +1 -1
@@ -717,7 +717,7 @@ {const char *hex_fp =format_hex_ex (BPTR (&cert_fp),BLEN (&cert_fp),0 ,1 ,":" , &gc); -msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint" +msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)" , hex_fp); goto cleanup;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/679?usp=email )
Change subject: Fix missing spaces in various messages
......................................................................
Fix missing spaces in various messages
These result from broken up literals where it
is easy to miss the missing space.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28950.html
---
M src/openvpn/dco.c
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/ssl_verify.c
4 files changed, 10 insertions(+), 10 deletions(-)
src/openvpn/dco.c +1 -1
@@ -185,7 +185,7 @@ }else { -msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to" +msg (D_DCO_DEBUG ,"Swapping primary and secondary keys to " "primary-id=%d secondary-id=(to be deleted)" , primary->key_id); }
src/openvpn/multi.c +6 -6
@@ -1804,7 +1804,7 @@ }else if (dco_enabled (o)) { -msg (M_INFO ,"Client does not support DATA_V2. Data channel offloaing " +msg (M_INFO ,"Client does not support DATA_V2. Data channel offloading " "requires DATA_V2. Dropping client." );auth_set_client_reason (tls_multi,"Data channel negotiation " "failed (missing DATA_V2)" );
@@ -1815,7 +1815,7 @@* not accept our pushed ciphers */ if (proto &IV_PROTO_NCP_P2P ) { -msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client" +msg (M_WARN ,"Note: peer reports running in P2P mode (no --pull/--client " "option). It will not negotiate ciphers with this server. " "Expect this connection to fail." ); }
@@ -2027,7 +2027,7 @@/* Not EOF but other error -> fall through to error state */ default :/* We received an unknown/unexpected value. Assume failure. */ -msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred" +msg (M_WARN ,"WARNING: Unknown/unexpected value in deferred " "client-connect resultfile" ); ret =CC_RET_FAILED ; }
@@ -2427,7 +2427,7 @@*/ if (!mi->context.c2.push_ifconfig_defined) { -msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote" +msg (D_MULTI_ERRORS ,"MULTI: no dynamic or static remote " "--ifconfig address is available for %s" ,multi_instance_string (mi, false, &gc)); }
@@ -2443,7 +2443,7 @@print_in_addr_t (mi->context.options.push_ifconfig_constraint_netmask,0 , &gc);/* JYFIXME -- this should cause the connection to fail */ - msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s)" + msg(D_MULTI_ERRORS, "MULTI ERROR: primary virtual IP for %s (%s) " "violates tunnel network/netmask constraint (%s/%s)", multi_instance_string(mi, false, &gc), print_in_addr_t(mi->context.c2.push_ifconfig_local, 0, &gc),
@@ -2492,7 +2492,7 @@ }else if (mi->context.options.iroutes) { -msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute" +msg (D_MULTI_ERRORS ,"MULTI: --iroute options rejected for %s -- iroute " "only works with tun-style tunnels" ,multi_instance_string (mi, false, &gc)); }
src/openvpn/options.c +2 -2
@@ -7033,7 +7033,7 @@ }else if (streq (p[0 ],"max-routes" ) && !p[2 ]) { -msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored." +msg (M_WARN ,"DEPRECATED OPTION: --max-routes option ignored. " "The number of routes is unlimited as of OpenVPN 2.4. " "This option will be removed in a future version, " "please remove it from your configuration." );
@@ -9328,7 +9328,7 @@ s++; }msg (M_WARN ,"DEPRECATED FEATURE: automatically upcased the " -"--x509-username-field parameter to '%s'; please update your" +"--x509-username-field parameter to '%s'; please update your " "configuration" , p[j]); } }
src/openvpn/ssl_verify.c +1 -1
@@ -717,7 +717,7 @@ {const char *hex_fp =format_hex_ex (BPTR (&cert_fp),BLEN (&cert_fp),0 ,1 ,":" , &gc); -msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint" +msg (D_TLS_ERRORS ,"TLS Error: --tls-verify/--peer-fingerprint " "certificate hash verification failed. (got certificate " "fingerprint: %s)" , hex_fp); goto cleanup;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/679?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic27d84c74c1dd6ff7973ca6966d186f475c67e21
Gerrit-Change-Number: 679
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged